Merge branch 'master' into treeview-refactor
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Fri, 17 Dec 2010 06:25:15 +0000 (15:25 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Fri, 17 Dec 2010 06:25:15 +0000 (15:25 +0900)
Conflicts:
tests/testtreeedit.c

1  2 
docs/reference/gtk/gtk3-sections.txt
gtk/gtk.symbols
gtk/gtkfilechooserdefault.c
gtk/gtktreeview.c
tests/testtreeedit.c

Simple merge
diff --cc gtk/gtk.symbols
Simple merge
Simple merge
Simple merge
index 86956975d48cbfc691e77eb88aaf4de188bb7e0a,4375691a0886709b8024e4811aec45304764521f..01e1f2bbe7deff816ef5fbc123c2a1a8fffc4918
@@@ -56,8 -55,7 +56,8 @@@ create_model (void
    GtkWidget *blah;
  
    blah = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   foo = gtk_widget_render_icon (blah, GTK_STOCK_NEW, GTK_ICON_SIZE_MENU, NULL);
-   bar = gtk_widget_render_icon (blah, GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU, NULL);
+   foo = gtk_widget_render_icon_pixbuf (blah, GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
++  bar = gtk_widget_render_icon_pixbuf (blah, GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU);
    gtk_widget_destroy (blah);
    
    model = gtk_tree_store_new (NUM_COLUMNS,